bitkeeper revision 1.1159.258.124 (42853d73dWp9gPjgpNWvy831DhnVnw)

compile.h.in, Makefile:
  Change XEN_EXTRAVERSION to -testing, move surrounding-" to compile.h.in.
  Also define XEN_FULLVESION and use.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/xen/Makefile b/xen/Makefile
index 15239eb5e164665b28cf819458713a717278c6a7..f17de889f6028e5b004d3f196ab82c9d85357831 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -10,7 +10,8 @@ INSTALL_DIR           = $(INSTALL) -d -m0755
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 2
 export XEN_SUBVERSION    = 0
-export XEN_EXTRAVERSION  = ""
+export XEN_EXTRAVERSION  = -testing
+export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 
 export BASEDIR          := $(CURDIR)
 
@@ -84,7 +85,7 @@ tools/figlet/figlet.o: tools/figlet/figlet.c
        $(CC) -o $@ -c $<
 
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
-       tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
+       tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) > $@.new
        @mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s

diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
index e5179509fb26b9590b9334d4b59a11d53ac21181..440ecb25c10bfa13a24293f0318937ee21ff8ca5 100644 (file)
--- a/xen/include/xen/compile.h.in
+++ b/xen/include/xen/compile.h.in
@@ -7,7 +7,7 @@
 
 #define XEN_VERSION            @@version@@
 #define XEN_SUBVERSION         @@subversion@@
-#define XEN_EXTRAVERSION       @@extraversion@@
+#define XEN_EXTRAVERSION       "@@extraversion@@"
 
 #define XEN_CHANGESET          "@@changeset@@"
 #define XEN_BANNER             \